Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix flaky integ test caused by latency of undeploy model #345

Merged
merged 2 commits into from
Sep 27, 2023

Conversation

zhichao-aws
Copy link
Member

@zhichao-aws zhichao-aws commented Sep 27, 2023

Description

For ml-commons plugin, after model undeploy returns, the max interval to update model status is 3s in ml-commons CronJob. This can cause flaky integ test in neural-search plugin. Add 3s sleep to fix this.
example: https://github.com/opensearch-project/neural-search/actions/runs/6321926472/job/17166662817

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed as per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: zhichao-aws <[email protected]>
@codecov
Copy link

codecov bot commented Sep 27, 2023

Codecov Report

Merging #345 (9f52554) into main (7bef7a0) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main     #345   +/-   ##
=========================================
  Coverage     84.56%   84.56%           
  Complexity      427      427           
=========================================
  Files            35       35           
  Lines          1289     1289           
  Branches        189      189           
=========================================
  Hits           1090     1090           
  Misses          118      118           
  Partials         81       81           

@navneet1v
Copy link
Collaborator

@zane-neo does this change needs to be backported?

@navneet1v navneet1v merged commit 67ced0d into opensearch-project:main Sep 27, 2023
@zane-neo
Copy link
Collaborator

@zane-neo does this change needs to be backported?

Yes, let's backport this.

@zane-neo zane-neo added the backport 2.x Label will add auto workflow to backport PR to 2.x branch label Sep 28, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-345-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 67ced0d0b9f1725b150721156481abc86fee3020
# Push it to GitHub
git push --set-upstream origin backport/backport-345-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-345-to-2.x.

zane-neo pushed a commit to zane-neo/neural-search that referenced this pull request Sep 28, 2023
…project#345)

* add 3s sleep before delete model

Signed-off-by: zhichao-aws <[email protected]>

* remove print stack trace

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: zhichao-aws <[email protected]>
(cherry picked from commit 67ced0d)
zane-neo added a commit to zane-neo/neural-search that referenced this pull request Sep 28, 2023
navneet1v pushed a commit that referenced this pull request Sep 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Label will add auto workflow to backport PR to 2.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants